From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 30 Apr 2025 09:13:09 +0000 (+0200)
Subject: windowManager: Stop bridging pad changes to OLED updates
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~124^2^2~13
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4170a06571c45de52f7c4f69ddfc0b7096cd3638;p=gnome-shell.git

windowManager: Stop bridging pad changes to OLED updates

The small OLEDs alongside pad buttons in Wacom Intuos 4 models will
stop being supported. See
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/416

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3706>
---

diff --git a/data/dbus-interfaces/org.gnome.SettingsDaemon.Wacom.xml b/data/dbus-interfaces/org.gnome.SettingsDaemon.Wacom.xml
deleted file mode 100644
index 13702141c..000000000
--- a/data/dbus-interfaces/org.gnome.SettingsDaemon.Wacom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<node>
-<interface name="org.gnome.SettingsDaemon.Wacom">
-  <method name="SetGroupModeLED">
-    <arg name="device_path" direction="in" type="s"/>
-    <arg name="group" direction="in" type="u"/>
-    <arg name="mode" direction="in" type="u"/>
-  </method>
-  <method name="SetOLEDLabels">
-    <arg name="device_path" direction="in" type="s"/>
-    <arg name="labels" direction="in" type="as"/>
-  </method>
-  </interface>
-</node>
diff --git a/data/gnome-shell-dbus-interfaces.gresource.xml b/data/gnome-shell-dbus-interfaces.gresource.xml
index 5005aa58d..69ce52927 100644
--- a/data/gnome-shell-dbus-interfaces.gresource.xml
+++ b/data/gnome-shell-dbus-interfaces.gresource.xml
@@ -39,7 +39,6 @@
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Color.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Power.Keyboard.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Rfkill.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.SettingsDaemon.Wacom.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.AudioDeviceSelection.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.CalendarServer.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Shell.ClocksIntegration.xml</file>
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 05aaeb240..c05a52ea1 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -22,7 +22,6 @@ import * as SwitchMonitor from './switchMonitor.js';
 import * as IBusManager from '../misc/ibusManager.js';
 import * as WorkspaceAnimation from './workspaceAnimation.js';
 
-import {loadInterfaceXML} from '../misc/fileUtils.js';
 import * as Main from './main.js';
 
 export const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
@@ -43,12 +42,6 @@ const ONE_SECOND = 1000; // in ms
 
 const MIN_NUM_WORKSPACES = 2;
 
-const GSD_WACOM_BUS_NAME = 'org.gnome.SettingsDaemon.Wacom';
-const GSD_WACOM_OBJECT_PATH = '/org/gnome/SettingsDaemon/Wacom';
-
-const GsdWacomIface = loadInterfaceXML('org.gnome.SettingsDaemon.Wacom');
-const GsdWacomProxy = Gio.DBusProxy.makeProxyWrapper(GsdWacomIface);
-
 const WINDOW_DIMMER_EFFECT_NAME = 'gnome-shell-window-dimmer';
 
 Gio._promisify(Shell, 'util_start_systemd_unit');
@@ -897,26 +890,6 @@ export class WindowManager {
             Main.osdWindowManager.show(monitorIndex, icon, label, null);
         });
 
-        this._gsdWacomProxy = new GsdWacomProxy(Gio.DBus.session,
-            GSD_WACOM_BUS_NAME, GSD_WACOM_OBJECT_PATH,
-            (proxy, error) => {
-                if (error)
-                    log(error.message);
-            });
-
-        global.display.connect('pad-mode-switch', (display, pad, _group, _mode) => {
-            let labels = [];
-
-            // FIXME: Fix num buttons
-            for (let i = 0; i < 50; i++) {
-                let str = display.get_pad_action_label(pad, Meta.PadActionType.BUTTON, i);
-                labels.push(str ?? '');
-            }
-
-            this._gsdWacomProxy?.SetOLEDLabelsAsync(
-                pad.get_device_node(), labels).catch(logError);
-        });
-
         global.display.connect('init-xserver', (display, task) => {
             IBusManager.getIBusManager().restartDaemon(['--xim']);